Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Wed, 9 Jun 2010 11:45:35 +0000 (11:45 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Wed, 9 Jun 2010 11:45:35 +0000 (11:45 +0000)

Trivial merge